Remove recently added uses of errno, as these cause trouble on ia64 builds.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
index c8d1204fc244eb07bb38029024467dbb31ee8670..3daf866f3365ce5091e05f256b3176e0c61b8945 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
@@ -81,7 +81,7 @@ static struct xs_handle xs_state;
 static LIST_HEAD(watches);
 static DEFINE_SPINLOCK(watches_lock);
 
-/* List of pending watch calbback events, and a lock to protect it. */
+/* List of pending watch callback events, and a lock to protect it. */
 static LIST_HEAD(watch_events);
 static DEFINE_SPINLOCK(watch_events_lock);
 
@@ -543,11 +543,8 @@ void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt, ...)
        char *printf_buffer = NULL, *path_buffer = NULL;
 
        printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL);
-       if (printf_buffer == NULL) {
-               printk("xenbus: failed to write error node for %s (%d): %d\n",
-                      dev->nodename, err, errno);
+       if (printf_buffer == NULL)
                goto fail;
-       }
 
        len = sprintf(printf_buffer, "%i ", -err);
        va_start(ap, fmt);
@@ -560,8 +557,8 @@ void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt, ...)
        path_buffer = error_path(dev);
 
        if (path_buffer == NULL) {
-               printk("xenbus: failed to write error node for %s (%s): %d\n",
-                      dev->nodename, printf_buffer, errno);
+               printk("xenbus: failed to write error node for %s (%s)\n",
+                      dev->nodename, printf_buffer);
                goto fail;
        }
 
@@ -586,8 +583,8 @@ void xenbus_dev_ok(struct xenbus_device *dev)
                char *path_buffer = error_path(dev);
 
                if (path_buffer == NULL) {
-                       printk("xenbus: failed to clear error node for %s: "
-                              "%d\n", dev->nodename, errno);
+                       printk("xenbus: failed to clear error node for %s\n",
+                              dev->nodename);
                        return;
                }